Skip to content

Update/device info plus#671

Merged
mhadaily merged 12 commits intofluttercommunity:mainfrom
nohli:update/device_info_plus
Jan 1, 2022
Merged

Update/device info plus#671
mhadaily merged 12 commits intofluttercommunity:mainfrom
nohli:update/device_info_plus

Conversation

@nohli
Copy link
Copy Markdown
Member

@nohli nohli commented Dec 29, 2021

Description

Bump version, so #588 can be published.

Related Issues

#569

Checklist

Before you create this PR confirm that it meets all requirements listed below by checking the relevant checkboxes ([x]).
This will ensure a smooth and quick review process. Updating the pubspec.yaml and changelogs is not required.

  • I read the Contributor Guide and followed the process outlined there for submitting PRs.
  • My PR includes unit or integration tests for all changed/updated/fixed behaviors (See Contributor Guide).
  • All existing and new tests are passing.
  • I updated/added relevant documentation (doc comments with ///).
  • The analyzer (flutter analyze) does not report any problems on my PR.
  • I read and followed the Flutter Style Guide.
  • I am willing to follow-up on review comments in a timely manner.

Breaking Change

Does your PR require plugin users to manually update their apps to accommodate your change?

  • Yes, this is a breaking change (please indicate a breaking change in CHANGELOG.md and increment major revision).
  • No, this is not a breaking change.

Copy link
Copy Markdown
Collaborator

@vbuberen vbuberen left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I believe there is another PR, which clashes with this one #663

@nohli
Copy link
Copy Markdown
Member Author

nohli commented Dec 29, 2021

The changes of this PR are already committed. Should we rather merge this PR, rebase the other PR and update its version?

@vbuberen
Copy link
Copy Markdown
Collaborator

@nohli Since #623 and #663 were opened earlier I would merge them first and update your PR afterwards.

@mhadaily
Copy link
Copy Markdown
Member

mhadaily commented Jan 1, 2022

@nohli once this is ready, let's merge this and then release a new package.

@nohli
Copy link
Copy Markdown
Member Author

nohli commented Jan 1, 2022

@mhadaily should we merge this one, too?
#623

@mhadaily
Copy link
Copy Markdown
Member

mhadaily commented Jan 1, 2022

@mhadaily should we merge this one, too? #623

yes, but it has conflicts now, unfortunately. I can resolve the conflict but I am not sure what I should change to fix it, do you know?

@nohli
Copy link
Copy Markdown
Member Author

nohli commented Jan 1, 2022

@mhadaily I can't see the conflicting file, or resolve the conflict, but it should be the changelog. Can you edit it and merge the 3.2.1 changes from main and https://github.com/fluttercommunity/plus_plugins/pull/623/files?

@mhadaily
Copy link
Copy Markdown
Member

mhadaily commented Jan 1, 2022

I have fixed the conflicts, https://github.com/fluttercommunity/plus_plugins/pull/623/files,

@nohli , please make sure in this PR we have all changelogs and versions properly in place, so then after this PR, I can lease one version.

@nohli
Copy link
Copy Markdown
Member Author

nohli commented Jan 1, 2022

@mhadaily done

@mhadaily
Copy link
Copy Markdown
Member

mhadaily commented Jan 1, 2022

@nohli other PR was merged too. please take a final look and then wait for build to complete, then I will merge if looks good to you and me and then I will release. sounds good?

Copy link
Copy Markdown
Member

@mhadaily mhadaily left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@mhadaily mhadaily merged commit 8f6f8c6 into fluttercommunity:main Jan 1, 2022
@github-actions github-actions Bot locked as resolved and limited conversation to collaborators Feb 3, 2025
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants